llvm-runtimes-builtins-build-check

add a check and only set up and build compiler-rt builtins if they have
not been disabled

Gbp-Pq: Name llvm-runtimes-builtins-build-check.diff

diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 3f9210b6f1c7a44f57e6b03195fd13f3a89d88a8..ba299568f3b27b8dff24d8a0a3408d4c2e6b5e0e 100644 (file)
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -146,10 +146,15 @@ endfunction()
 # is required because the other runtimes need the builtin libraries present
 # before the just-built compiler can pass the configuration tests.
 get_compiler_rt_path(compiler_rt_path)
-if(compiler_rt_path)
+# check if builtins have been disabled
+set(RUNTIMES_BUILD_BUILTINS ON)
+if(DEFINED COMPILER_RT_BUILD_BUILTINS)
+  set(RUNTIMES_BUILD_BUILTINS ${COMPILER_RT_BUILD_BUILTINS})
+endif()
+if(compiler_rt_path AND RUNTIMES_BUILD_BUILTINS)
   # If the user did not specify the targets infer them from the runtimes.
   set(builtin_targets ${LLVM_BUILTIN_TARGETS})
-  if(NOT builtin_targets)
+  if(NOT LLVM_BUILTIN_TARGETS)
     if("compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
       list(APPEND builtin_targets "default")
     endif()